Don't try to load an alpha channel from the BMP, since there is no

Fri Mar  5 22:22:25 2004  Matthias Clasen  <maclas@gmx.de>

	* io-bmp.c (OneLine32): Don't try to load an alpha channel
	from the BMP, since there is no evidence that even 32bit
	BMPs have an alpha channel.  (#135502)

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 7f142e58a9f047608e705047093557c2a4aec4f6..ea04dbfd537d4afdc295de06de78f92182c1a6f1 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,9 @@
+Fri Mar  5 22:22:25 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * io-bmp.c (OneLine32): Don't try to load an alpha channel
+       from the BMP, since there is no evidence that even 32bit
+       BMPs have an alpha channel.  (#135502)
+
 Mon Mar  1 19:47:48 2004  Owen Taylor  <otaylor@redhat.com>
 
         * === Released 2.3.5 ====

diff --git a/gdk-pixbuf/io-bmp.c b/gdk-pixbuf/io-bmp.c
index e14a011276a5379659116cdf49afbfbdc5c8220e..d43bed95a5593e567e0b2bb539a5b8f2ab766d74 100644 (file)
--- a/gdk-pixbuf/io-bmp.c
+++ b/gdk-pixbuf/io-bmp.c
@@ -624,7 +624,7 @@ static void OneLine32(struct bmp_progressive_state *context)
                        *pixels++ = (r << r_lshift) | (r >> r_rshift);
                        *pixels++ = (g << g_lshift) | (g >> g_rshift);
                        *pixels++ = (b << b_lshift) | (b >> b_rshift);
-                       *pixels++ = src[3]; /* alpha */
+                       *pixels++ = 0xff;
 
                        src += 4;
                }
@@ -633,7 +633,7 @@ static void OneLine32(struct bmp_progressive_state *context)
                        *pixels++ = src[2];
                        *pixels++ = src[1];
                        *pixels++ = src[0];
-                       *pixels++ = src[3];
+                       *pixels++ = 0xff;
 
                        src += 4;
                }